Allow declaring existential types inside blocks #52645
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
dtolnay
approved these changes
Jul 23, 2018
|
@bors r+ |
|
📌 Commit 58758c5de691ff528a4053b84ef7b89f4b71724c has been approved by |
bors
added
S-waiting-on-bors
cramertj
reviewed
Jul 23, 2018
src/libsyntax/parse/parser.rs
Outdated
| @@ -4391,6 +4391,10 @@ impl<'a> Parser<'a> { | |||
| self.token.is_keyword(keywords::Extern) && self.look_ahead(1, |t| t != &token::ModSep) | |||
| } | |||
|
|
|||
| fn is_existential_type_decl(&self) -> bool { | |||
| self.token.is_keyword(keywords::Existential) && self.look_ahead(1, |t| t.is_ident()) | |||
There was a problem hiding this comment.
Why check if the next token is an ident rather than checking if it is the keyword type?
There was a problem hiding this comment.
because I got confused and panicked by beating the problem with a shovel?
For real: I didn't find a token::Type and decided "oh checking for the concrete identifier is too hard"... all while i did that before the &&...
I'll fix it asap
oli-obk
force-pushed
the
existential_in_fn_body
branch
from
58758c5 to
2e33a55
Compare
|
@bors r=dtolnay rollup |
|
📌 Commit 2e33a55 has been approved by |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jul 24, 2018
…tolnay Allow declaring existential types inside blocks fixes rust-lang#52631 r? @dtolnay
bors
added a commit
that referenced
this pull request
Jul 25, 2018
Rollup of 7 pull requests Successful merges: - #52391 (Add unaligned volatile intrinsics) - #52402 (impl PartialEq+Eq for BuildHasherDefault) - #52645 (Allow declaring existential types inside blocks) - #52656 (Stablize Redox Unix Sockets) - #52658 (Prefer `Option::map`/etc over `match` wherever it improves clarity) - #52668 (clarify pointer offset function safety concerns) - #52677 (Release notes: add some missing 1.28 libs stabilization) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #52631
r? @dtolnay